Create your own conflict #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open

github-learning-lab wants to merge 1 commit into main from add-education

github-learning-lab bot commented Nov 19, 2021

Step 5: Create your own conflict

So far, this pull request doesn't have any conflicts. I have added some new branch protections to prevent you from merging before you're ready.

In the last activity, you solved a merge conflict that someone else created. This time, you'll create the merge conflict yourself.

⌨️ Activity: Make changes on this branch

Check out to this branch:
```
git checkout add-education
```
Open _data/education.yml in your text editor.
Modify the content in the degree:, uni:, year:, and summary: lines.

Stage and commit the changes:

git add _data/education.yml
git commit -m "<YOUR-MESSAGE>"

Push your changes to GitHub:
```
git push
```

Watch below for my response.


          commit for education branch

b05509a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet